Skip to content

Dev - #67

Merged
ggamnunq merged 19 commits into
mainfrom
dev
Jul 23, 2026
Merged

Dev#67
ggamnunq merged 19 commits into
mainfrom
dev

Conversation

@ggamnunq

Copy link
Copy Markdown
Contributor

No description provided.

lso5507 and others added 19 commits July 18, 2026 13:22
feat: 써클 탈퇴 기능 구현
PR #49(085de07)에서 dev를 다른 브랜치로 병합할 때, 이미 재병합(PR #48)된
feature/SAIO-164 변경분이 base와 동일한 내용으로 인식되어 되돌리기(PR #47) 쪽
삭제가 충돌 없이 그대로 적용되며 사라졌다. 이후 main/dev 양쪽에 이 상태가
그대로 이어져왔다.

005d654(PR #48, 마지막으로 정상 반영된 상태) 기준으로 UrgencyLevel, isMe
스웨거 직렬화, 홈 응답의 ScheduleView 연동 등을 복구했다.
fix[SAIO-164]: 홈 써클 멤버 화면 me -> isMe
feat[SAIO-262]: 알림 설정 dDay name 옵션 추가
# Conflicts:
#	src/main/kotlin/com/unicorn/server/domain/schedule/port/out/ScheduleOutPort.kt
#	src/main/kotlin/com/unicorn/server/infrastructure/adapter/out/persistence/schedule/ScheduleJpaRepository.kt
#	src/main/kotlin/com/unicorn/server/infrastructure/adapter/out/persistence/schedule/SchedulePersistenceAdapter.kt
#	src/test/kotlin/com/unicorn/server/domain/schedule/service/CancelConfirmationServiceTest.kt
#	src/test/kotlin/com/unicorn/server/domain/schedule/service/ScheduleCommandServiceTest.kt
#	src/test/kotlin/com/unicorn/server/domain/schedule/service/ScheduleConfirmationServiceTest.kt
#	src/test/kotlin/com/unicorn/server/domain/schedule/service/ScheduleQueryServiceTest.kt
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Caution

The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased.

@ggamnunq
ggamnunq merged commit 4644772 into main Jul 23, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants